scripting: Exit helper after running test

This avoids the helper process exiting with an error due to a broken
pipe.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1349>

diff --git a/data/dbus-interfaces/org.gnome.Shell.PerfHelper.xml b/data/dbus-interfaces/org.gnome.Shell.PerfHelper.xml
index 98fea27e9434acd27c0c04734f6273c6a6a922a9..140bbcc3457a246c8e9bc221a256e02bfac48670 100644 (file)
--- a/data/dbus-interfaces/org.gnome.Shell.PerfHelper.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.PerfHelper.xml
@@ -1,5 +1,6 @@
 <node>
   <interface name="org.gnome.Shell.PerfHelper">
+    <method name="Exit"/>
     <method name="CreateWindow">
       <arg type="i" direction="in"/>
       <arg type="i" direction="in"/>

diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index a4d80d74968627680595283e1d4af5ab488f2892..76a74d5e80bf558863064520e0f51ad6b69712fe 100644 (file)
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -284,6 +284,15 @@ async function _runPerfScript(scriptModule, outputFile) {
         log(`Script failed: ${err}\n${err.stack}`);
         Meta.exit(Meta.ExitCode.ERROR);
     }
+
+    try {
+        const perfHelper = _getPerfHelper();
+        perfHelper.ExitSync();
+    } catch (err) {
+        log(`Failed to exit helper: ${err}\n${err.stack}`);
+        Meta.exit(Meta.ExitCode.ERROR);
+    }
+
     Meta.exit(Meta.ExitCode.SUCCESS);
 }